From ad8627ce88fb518b963f96eea4457e174ed53835 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 4 Aug 2018 12:25:44 -0500 Subject: [PATCH] Have emacs-{gtk,lucid,nox} replace all the related emacs25 packages Add "emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25)" to the "Replaces:" for emacs-gtk, emacs-lucid, and emacs-nox to avoid conflicts over /usr/share/emacs/25.2/etc/DOC while unpacking. Thanks to Axel Beckert for reporting the problem and Adrian Bunk and Sven Joachim for help with the solution. Closes: 904957 --- debian/control | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index c3248909965..1b8049f67f4 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,8 @@ Depends: Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader Suggests: emacs-common-non-dfsg Conflicts: emacs-gtk, emacs-nox -Replaces: emacs-gtk, emacs-nox +Replaces: emacs-gtk, emacs-nox, + emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25) Description: GNU Emacs editor (with Lucid GUI support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with support for a graphical user @@ -70,7 +71,8 @@ Depends: Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader Suggests: emacs-common-non-dfsg Conflicts: emacs-gtk, emacs-lucid -Replaces: emacs-gtk, emacs-lucid +Replaces: emacs-gtk, emacs-lucid, + emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25) Description: GNU Emacs editor (without GUI support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs compiled without support for X, @@ -95,7 +97,8 @@ Depends: Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader Suggests: emacs-common-non-dfsg Conflicts: emacs-lucid, emacs-nox -Replaces: emacs-lucid, emacs-nox +Replaces: emacs-lucid, emacs-nox, + emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25) Description: GNU Emacs editor (with GTK+ GUI support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a graphical user interface -- 2.30.2